merge
authorawilliam@xenbuild.aw <awilliam@xenbuild.aw>
Fri, 17 Mar 2006 22:37:28 +0000 (15:37 -0700)
committerawilliam@xenbuild.aw <awilliam@xenbuild.aw>
Fri, 17 Mar 2006 22:37:28 +0000 (15:37 -0700)
1  2 
xen/arch/ia64/xen/xentime.c

Simple merge